* src/fontset.c (check_fontset_name): A better fix for bug#49782.

diff --git a/src/fontset.c b/src/fontset.c
index d2d428da2eefd98f2fb3ea475ad64b08a52286b2..7d4bd65f70c270d5ae9792bb936487a6de72aa05 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1356,15 +1356,16 @@ check_fontset_name (Lisp_Object name, Lisp_Object *frame)
   int id;
   struct frame *f = decode_live_frame (*frame);
 
-  if (!FRAME_WINDOW_P (f) && !FRAME_INITIAL_P (f))
-    error ("Can't use fontsets in non-GUI frames");
-
   XSETFRAME (*frame, f);
 
   if (EQ (name, Qt))
     return Vdefault_fontset;
   if (NILP (name))
-    id = FRAME_FONTSET (f);
+    {
+      if (!FRAME_WINDOW_P (f))
+       error ("Can't use fontsets in non-GUI frames");
+      id = FRAME_FONTSET (f);
+    }
   else
     {
       CHECK_STRING (name);